Copy the definition of DOM0_UUID into XenDomain so that we don't need to import

large swathes of the server to run the Xen-API tests.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/xm-test/lib/XmTestLib/XenDomain.py b/tools/xm-test/lib/XmTestLib/XenDomain.py
index 3fcfcea4f144444d6b94a7803f700655eeaabe4a..09d6f4c764222a23eb27c9b83678c83787a3cbf0 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py
@@ -33,6 +33,9 @@ from DomainTracking import *
 from acm import *
 
 
+DOM0_UUID = "00000000-0000-0000-0000-000000000000"
+
+
 def getDefaultKernel():
     return arch.getDefaultKernel()
 

diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
index 4798dc13c6d8bd4410043dc238441fc18f3b47b3..6a17c510455b8276b2704bbaa0d6c8d399dde256 100644 (file)
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py
@@ -13,7 +13,6 @@
 from XmTestLib import xapi
 from XmTestLib.XenAPIDomain import XmTestAPIDomain
 from XmTestLib import *
-from xen.xend import XendDomain
 from vtpm_utils import *
 import commands
 import os
@@ -28,7 +27,7 @@ except Exception, e:
 vm_uuid = domain.get_uuid()
 
 vtpmcfg = {}
-vtpmcfg['backend'] = XendDomain.DOM0_UUID
+vtpmcfg['backend'] = DOM0_UUID
 vtpmcfg['VM'] = vm_uuid
 
 session = xapi.connect()